chore: merge main into development - #147

diff --git a/app/_launch_runtime.py b/app/_launch_runtime.py
--- a/app/_launch_runtime.py
+++ b/app/_launch_runtime.py
@@ -35994,6 +35994,22 @@
         # cancellation/completion won. Canonical resume explicitly transitions
         # the registry before the next active adapter snapshot arrives.
         return existing
+    existing_metadata = existing.get("metadata") if isinstance(existing.get("metadata"), dict) else {}
+    incoming_metadata = fields.get("metadata") if isinstance(fields.get("metadata"), dict) else None
+    if incoming_metadata is not None:
+        merged_metadata = dict(existing_metadata)
+        for key, value in incoming_metadata.items():
+            if value is not None:
+                merged_metadata[key] = value
+        fields["metadata"] = merged_metadata
+        # Reservation owns attempt identity. Adapter snapshots must not
+        # replace workflow/title after submit_music_generation wrote them.
+        if any(
+            existing_metadata.get(key)
+            for key in ("generation_id", "candidate_id", "command_id", "idempotency_key")
+        ):
+            fields.pop("workflow", None)
+            fields.pop("title", None)
     mutable = {
         key: value for key, value in fields.items()
         if key not in {"id", "created_at"}
@@ -36328,9 +36344,16 @@
             "actor": provenance.get("actor") or "unknown",
             "tool": provenance.get("tool") or adapter,
             "capability": provenance.get("capability"),
-            "command_id": command.get("command_id"),
+            "command_id": (
+                command.get("command_id")
+                or record.get("commandId")
+                or record.get("command_id")
+            ),
             "workflow_id": command.get("workflow_id"),
             "run_id": command.get("run_id"),
+            "generation_id": record.get("generationId") or record.get("generation_id"),
+            "candidate_id": record.get("candidateId") or record.get("candidate_id"),
+            "idempotency_key": record.get("idempotencyKey") or record.get("idempotency_key"),
         },
     )
 

diff --git a/tests/test_task_adapter_helpers.py b/tests/test_task_adapter_helpers.py
--- a/tests/test_task_adapter_helpers.py
+++ b/tests/test_task_adapter_helpers.py
@@ -256,3 +256,81 @@
 
     assert captured["id"] == "task-model3d-backend-id"
     assert captured["root_id"] == "task-series-root"
+
+
+def test_generic_adapter_publishes_reserved_music_identity():
+    publish, captured = _load_publisher("_publish_generic_legacy_task")
+
+    publish({
+        "jobId": "minimax-music-abc123def456",
+        "taskId": "task-minimax-music-abc123def456",
+        "workspace": "default",
+        "status": "queued",
+        "generationId": "gen-1",
+        "commandId": "cmd-1",
+        "candidateId": "song-1",
+        "idempotencyKey": "idem-1",
+    }, "minimax-music")
+
+    assert captured["metadata"]["generation_id"] == "gen-1"
+    assert captured["metadata"]["command_id"] == "cmd-1"
+    assert captured["metadata"]["candidate_id"] == "song-1"
+    assert captured["metadata"]["idempotency_key"] == "idem-1"
+
+
+def test_upsert_keeps_reserved_task_identity():
+    existing = {
+        "id": "task-minimax-music-abc",
+        "status": "queued",
+        "workflow": "generate_story_song",
+        "title": "Story song",
+        "metadata": {
+            "generation_id": "gen-1",
+            "candidate_id": "song-1",
+            "command_id": "cmd-1",
+            "idempotency_key": "idem-1",
+        },
+    }
+    updated = {}
+
+    class Registry:
+        def get(self, _task_id):
+            return existing
+
+        def update(self, task_id, **fields):
+            updated.update(fields)
+            return {**existing, **{key: value for key, value in fields.items()
+                                   if key not in {"force", "event_type", "event_exclude_fields"}}}
+
+    namespace = {
+        "_task_registry": lambda _workspace: Registry(),
+    }
+    node = _function("_upsert_canonical_task")
+    exec(compile(ast.Module(body=[node], type_ignores=[]), str(LAUNCH_PATH), "exec"), namespace)
+
+    result = namespace["_upsert_canonical_task"](
+        "default",
+        "task-minimax-music-abc",
+        workflow="minimax-music",
+        title="MiniMax Music",
+        status="queued",
+        metadata={
+            "adapter": "minimax-music",
+            "actor": "unknown",
+            "tool": "minimax-music",
+            "capability": None,
+            "command_id": None,
+            "workflow_id": None,
+            "run_id": None,
+        },
+    )
+
+    assert "workflow" not in updated
+    assert "title" not in updated
+    assert result["workflow"] == "generate_story_song"
+    assert result["title"] == "Story song"
+    assert result["metadata"]["generation_id"] == "gen-1"
+    assert result["metadata"]["candidate_id"] == "song-1"
+    assert result["metadata"]["command_id"] == "cmd-1"
+    assert result["metadata"]["idempotency_key"] == "idem-1"
+    assert result["metadata"]["adapter"] == "minimax-music"